-
-
Notifications
You must be signed in to change notification settings - Fork 10
1D responces using PSF model #4
base: main
Are you sure you want to change the base?
Conversation
There is clearly a lot going on in this PR. Is it intended that all the generated images are included in the git repro? Won't they be generated by rtd when the docs are build? |
These are the all the commits I'll squash them today and no they shouldn't be there i'll remove them |
I think it would be easier to pull master and rewrite the code than trying to fix this with a rebase |
I am not sure I follow. Could you be more specific? |
@olaurino fixing the commits will probably take longer than just writting the code from what exists in master and remaking the branch |
You can easily squash all commits, then you can fix any conflicts and then, if you want, you can split all the code in cleaner commits or in different branches if that's what you want. I am not sure what you mean by "fixing" though, so maybe I am missing something. Please feel free to skype me if you want to talk about it. |
There's a lot more commits here than there should be, not sure how they ended up here. |
Which is why this might be a good time to improve your git-fu ;) Rather than rebasing, simply squash all commits first in the current branch into a single commit. Then do a diff, and see whether what you see is more or less what you would like to get. Then start a new branch off master and cherry-pick the squashed commit (with |
Cheers @olaurino It looks much nicer now :) |
Regarding coverage, have you tried adding |
If a rsp is supplied then the model is wrapped in a sherpa PSF model. This is only done to the sherpa fit model and not the input/returned astropy model.
1D and 2D rsp's are the same but this branch has an statement which makes the rsp=None if the dataset is 2D and the 2D